projects / cargo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12f76a5 6f6d7c8)
Auto merge of #2547 - alexcrichton:more-locking, r=brson
authorbors <bors@rust-lang.org>
Wed, 6 Apr 2016 16:56:36 +0000 (09:56 -0700)
committerbors <bors@rust-lang.org>
Wed, 6 Apr 2016 16:56:36 +0000 (09:56 -0700)
commitf20ca62a9b43c40e87b2aef004bd25c57eb7fe63
tree179f49457cfb2103a89ebdbc75f85c3570f983a9tree | snapshot
parent12f76a542a9f0c2a5791432ea1df7b30ae28d0c6commit | diff
parent6f6d7c8d198b199388f907952cc0c8c80e49f93fcommit | diff
Auto merge of #2547 - alexcrichton:more-locking, r=brson

Add file locks in a few more locations

One was discovered by making `target_dir` return a `Filesystem`, the other was discovered by failing tests on the nightly OSX bots.
src/cargo/ops/cargo_generate_lockfile.rs diff1 | diff2 | blob | history
tests/test_cargo_generate_lockfile.rs diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.